[automated] Merge branch 'vs17.12' => 'vs17.13' #11203
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…: Build ID 10000931 (#10267) * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9752299 * Increase VersionPrefix version --------- Co-authored-by: Jenny Bai <[email protected]>
* Resolves CG alerts --------- Co-authored-by: Rainer Sigwald <[email protected]>
* Fixing the assembly redirect
* Update dependencies from https://github.com/dotnet/arcade build 20240910.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24460.4 * version bump --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Mariana Garces Dematte <[email protected]>
Will address dotnet/sdk#43339 when deployed in VS. --------- Co-authored-by: Rainer Sigwald <[email protected]>
Part of: #10665 Disabling localization for 17.11.
* Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24508.1 * bump the version --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: YuliiaKovalova <[email protected]>
* Bump Microsoft.IO.Redist to 6.0.1 * Bump version prefix to 17.11.11
* Update dependencies from https://github.com/dotnet/arcade build 20241112.12 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12 * Update VersionPrefix to 17.11.16 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]>
…120.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5
This pull request updates the following dependencies [marker]: <> (Begin:aca86521-13b3-4d28-a005-127af3b681e5) ## From https://github.com/dotnet/arcade - **Subscription**: aca86521-13b3-4d28-a005-127af3b681e5 - **Build**: 20241120.5 - **Date Produced**: November 20, 2024 10:02:02 PM UTC - **Commit**: 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24562.12 to 8.0.0-beta.24570.5][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24562.12 to 8.0.0-beta.24570.5][1] - **Microsoft.DotNet.XUnitExtensions**: [from 8.0.0-beta.24562.12 to 8.0.0-beta.24570.5][1] [1]: dotnet/arcade@42652ca...3c7e11b [DependencyUpdate]: <> (End) [marker]: <> (End:aca86521-13b3-4d28-a005-127af3b681e5)
Backport of #11042 to vs17.11
Co-authored-by: Jan Provaznik <[email protected]>
* Update dependencies from https://github.com/dotnet/arcade build 20241122.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24562.13 -> To Version 9.0.0-beta.24572.2 * Update version prefix to 17.12.14 * Update BootstrapSdkVersion * Decreasing severity of IDE0306 * Decrease IDE0303 severity * Update cibuild_bootstrapped_msbuild.ps1 * Update cibuild_bootstrapped_msbuild.sh --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Jan Krivanek <[email protected]>
* Update .vsts-dotnet.yml * Version bump
* Bump up VS version to 17.12 * Bump up xcopy-msbuild to 17.12.0 * Bump up version prefix to 17.12.21 --------- Co-authored-by: Gang Wang <[email protected]>
* Check version bump on release branches' update * Skip check version bump on release branch update for initial commit to release branch or the change from dotnet bot * Remove the exception for dependencies update by dotnet-maestro[bot] * Bump version * [automated] Merge branch 'vs17.9' => 'vs17.10' (#10081) * Dont ngen taskhost Fixes our lack of optprof data (#8737) Don't ngen TaskHosts * Bump version * Bump version * Update System.Security.Cryptography.Pkcs * Bump version * Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751) * [release/vs17.7] Onboard 1es templates (#9924) * bump arcade version * bump MicrosoftNetCompilersToolsetVersion * bump MicrosoftNetCompilersToolsetVersion * update sha for Microsoft.Net.Compilers.Toolset * update darc * update arcade channel .net 8 * update arcade * Changed pool image --------- Co-authored-by: Forgind <[email protected]> Co-authored-by: Jan Krivanek <[email protected]> Co-authored-by: sujitnayak <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Mariana Dematte <[email protected]> * Disable localization for vs17.10 (#10269) Co-authored-by: Rainer Sigwald <[email protected]> * Enable private feeds for release branch (#10355) This PR enables MSBuild to take security fixes from MSBuild dependencies. * [vs17.10] Update dependencies from dotnet/arcade (#10809) * Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24508.1 * Update Versions.props --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: YuliiaKovalova <[email protected]> * CG alert cleaning on VS17.10 (#10724) * Bump Microsoft.IO.Redist to 6.0.1 * Bump System.Formats.Asn1 to 8.0.1 * [vs17.10] Update dependencies from dotnet/arcade (#10833) * [vs17.10] Update dependencies from dotnet/arcade (#10896) * [vs17.10] Update dependencies from dotnet/arcade (#10992) * Update dependencies from https://github.com/dotnet/arcade build 20241112.12 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12 * Update VersionPrefix to 17.10.13 * Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4 * Revert "Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4" This reverts commit 66381f3. * Update dependencies from https://github.com/dotnet/arcade build 20241120.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24570.5 * Reapply "Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4" This reverts commit 2cffa88. --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> * [automated] Merge branch 'vs17.8' => 'vs17.10' (#11124) * Dont ngen taskhost Fixes our lack of optprof data (#8737) Don't ngen TaskHosts * Bump version * Bump version * Update System.Security.Cryptography.Pkcs * Bump version * Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751) * [release/vs17.7] Onboard 1es templates (#9924) * bump arcade version * bump MicrosoftNetCompilersToolsetVersion * bump MicrosoftNetCompilersToolsetVersion * update sha for Microsoft.Net.Compilers.Toolset * CG alert cleaning on VS17.8 (#10725) * Bump Microsoft.IO.Redist to 6.0.1 * Bump System.Formats.Asn1 to 8.0.1 * Bump System.Text.Json to 8.0.0.4 * Bump the dependencies of System.Text.Json * Add System.Formats.Asn1 8.0.1 to the pre-built exception list * Bump version prefix to 17.8.8 * Updated System.Collection.Immutable package to v8 * Adding System.Collections.Immutable 8.0.0 to the pre-built exception list * Updated Version.Details.xml * [vs17.8] update arcade and fix build (#10838) * Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23423.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk * remove BuildXL from nuget config * compatibility suppressions * Update dependencies from https://github.com/dotnet/arcade build 20241… Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1 * include PortableRuntimeIdentifierGraph.json * Suppress a warning IDE0305 * bump version --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <[email protected]> * [vs17.8] Sync internal and public branches (#10858) * Update dependencies from https://github.com/dotnet/arcade build 20241025.2 (#10894) * [vs17.8] Update dependencies from dotnet/arcade (#10986) * Update dependencies from https://github.com/dotnet/arcade build 20241112.12 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12 * Update VersionPrefix to 17.8.11 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Surayya Huseyn Zada <[email protected]> * Update dependencies from https://github.com/dotnet/arcade build 20241120.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5 * Update VersionPrefix to 17.8.12 * [vs17.8] Backport VS insertion pipeline YMLs (#11066) Co-authored-by: Jan Provaznik <[email protected]> * Update .opt-prof.yml (#11112) * [vs17.8] Fix setting package versions in VS insertion (#11103) * fix setting package versions * use VS branch names in servicing package decision --------- Co-authored-by: Jan Provaznik <[email protected]> * Update vs/msbuild version (#11115) * Update vs/msbuild version * Bump version * Update xcopy-msbuild version to 17.8.5 (#11118) * Add inter-branch merge flow file (#11123) * Update .opt-prof.yml (#11121) * Bump up System.Text.Json to 8.0.5 (#11134) * Remove the change to CompatibilitySuppressions.xml * Remove unnecessary workaround for sdk 8.0.1xx bootstrap in the branch vs17.8 * Bump up version prefix to 17.10.14 --------- Co-authored-by: Forgind <[email protected]> Co-authored-by: Jan Krivanek <[email protected]> Co-authored-by: sujitnayak <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Jan Provazník <[email protected]> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [vs17.10] Run tests even if version is not bumped (#11059) Co-authored-by: Jan Provaznik <[email protected]> * Bump up version prefix to 17.11.20 --------- Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Jan Krivanek <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: dotnet-maestro-bot <[email protected]> Co-authored-by: Forgind <[email protected]> Co-authored-by: sujitnayak <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Mariana Dematte <[email protected]> Co-authored-by: AR-May <[email protected]> Co-authored-by: Rainer Sigwald <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Jan Provazník <[email protected]> Co-authored-by: Jenny Bai <[email protected]>
I detected changes in the vs17.11 branch which have not been merged yet to vs17.12. I'm a robot and am configured to help you automatically keep vs17.12 up to date, so I've opened this PR. This PR merges commits made on vs17.11 by the following committers: * @github-actions[bot] * @surayya-MS * @GangWang01 * @dotnet-maestro[bot] * @maridematte * @MichalPavlik * @dotnet-bot ## Instructions for merging from UI This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. ## Instructions for merging via command line Run these commands to merge this pull request from the command line. ``` sh git fetch git checkout vs17.11 git pull --ff-only git checkout vs17.12 git pull --ff-only git merge --no-ff vs17.11 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12 ``` <details> <summary>or if you are using SSH</summary> ``` git push [email protected]:dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs17.11-to-vs17.12'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/vs17.11-to-vs17.12 origin/vs17.12 git pull https://github.com/dotnet/msbuild merge/vs17.11-to-vs17.12 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs17.11-to-vs17.12 origin/vs17.12 git pull [email protected]:dotnet/msbuild merge/vs17.11-to-vs17.12 (make changes) git commit -m "Updated PR with my changes" git push [email protected]:dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12 ``` </details> Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
|
This pull request has been updated. This PR merges commits made on vs17.12 by the following committers:
|
|
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs17.12, but I could not automatically push those to merge/vs17.12-to-vs17.13 to update this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the vs17.12 branch which have not been merged yet to vs17.13. I'm a robot and am configured to help you automatically keep vs17.13 up to date, so I've opened this PR.
This PR merges commits made on vs17.12 by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs17.12-to-vs17.13'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.